Fixing test failures
Cosmetics