fixed unit tests, all 36 tests pass