Fixed 2 broken tests