additional unit tests cleaning up logging statements

adding some more unit tests and cleaning up logging statements