Additional tests and cleanup