Code refactoring
Fixed unit tests based on the last refactor
Merge remote-tracking branch 'origin/master'