More test cases working.