Fixing failing tests on dev