Made fixes to new test case