Clean up test build rules

Next step is to convert the tests to boilermake