Fix for the failing test cases