Fixed the 2 broken tests