more cleanup; fixing tests to be better