fixed 2 tests