Demo test cleanup