Cleaned the code in All tests
formatted other classes