cleanup and tests pass again