Fix for test cases