Fixed issue which prevented running all test cases