Code review corrections
Tests