more unit tests
unit testing improvements