- cleaning up unit tests and fixing minor issues discovered