Different improvements
Tests