Improved builds so that to not overlap on the test server.