TESTS: Fixed broken tests