Clean up test further