#82 adds unit testing