Cleaned the code for the  tests
Cleaned the code for the  tests