Fix issue with test suite