Fixing failed tests
Fixing failed tests