and further toward a usable interface, totally refactored tests again
a bit more cleanup from test refactorings