Add an incremental test and cleanup another test.