wip #72 - test cleanup