more testsmore tests and cleanup