Rectified the test failures