More test cases enabled and test case bug fixed