Change input format and test cases