* Removing 'loop' method
* Refactoring the tests