Fixed tests
Removed unused stuff