Testacular fixed
Testacular unit tests refactoring