more unit tests
wip