all tests pass but needs to be tested on Strauss