Minor fixes
Removal of unused methods
Refactoring
Extended tests