Refactorings
A few more test cases.