* Code refactored
* Test established