[1.0.1] increase test coverage, minor style fixes

Signed-off-by: Eli Skeggs <eskeggs@globesherpa.com>