fixed tests, test suite is green