more test cases working