Add more test cases, remove commented code.