[#79692868] more complete unit coverage

nice coverage and structure for existing
functionality... now lets tie it all together