More test cases working...