-- slowly fixing tests
-- fixed remaining breaking tests