WIP
More test cases.