A few more test cases. Simplified test code. Replaced tab chars with "\t" in test code.