Speed up test
Clean up