Fix testcases by removing comment tests