deleted trash
Refactored some tests