more test cases, now to get them to pass