Function parameters renaming
Some getters and setters added
Tests added