cleaned up a little bit more the tests code