Organize the executable tests to easily map to the abstract tests

[ghobona]

It should be made easier for a user to associate an executable test with and abstract test.