Uncommented some test cases