Trying to make test suite work