refactoring
for consistency
onto something
minor test rewrite
0.0.7