Updated the test suit