More verbose output report and additional unit tests