Cleaning code
Implementing JUnitParams methods