More test cleanup, starting on true merge test