Fix issues with test suite