started fixing test suite