Update tests
Fixing broken tests
Fixing broken tests