fixed 2 tests already