New test and cleanup.