Consolidate test directories

[lucacome]

We have the conformance tests in a separate directory, with a separate Makefile.
As a developer I want to have all the tests in the same place and reduce the amount of variables and changes needed for a release.