Fixed broken tests :(