Address some Scrutinizer items
Expand some test coverage