fixing broken tests, everything passes now