Enable tests
Removed unused code