Fixes for tests

Fixes for test failures