Added additional unit tests, all tests succeed.