fixed remaining skipped tests