fixing broken tests
fixing broken tests 02
fixing broken tests 03