improved unit testing
continue to improve unit tests
unit testing improvements