fixed broken tests
fixing test errors