Fix tests

Fixes couple of tests that are failing in branches