Improve test build