more unit tests, etc