fixed remaining failing tests