fix tests, cleanup