cleanup
additional unit test