Making the code conform to the other tests