now the tests pass aswell