Test fixes, hack to only mess with netflixoss-build-infrastructure