Simplify the test building