Tried rectifying the test failures