Fixes for test fails

Fixes tests locally