Removed tests
Removed tests
Final version