Fixing some stupidly broken tests ><