Use the new code of testing