cleaning code
cleaning...
Refactored util test class