Working through new test cases