Remove debug prints; add a few more useful test cases.