Fix failing tests

Fixes for tests