fix a test, cleanup