added tests, fix to make test pass. one new test failing.