Try and fix test building