Solved the test suite issue