Unifying the tests scripts