Multiple improvements
Removed tests