Made it so all tests compile