clean up tests
DRY out
bump revision