new tests and cleanup