fixed 12 tests