Working with the final version of the tests