refs #6 - more unit tests