Minor changes
Refactoring
New tests