Make clean test build work