Fix problem with test suite