fixed remaining 2 failing tests