fleshed out more test cases