Under construction: More test cases.