Cleaned up test folders