Fix an issue with clashing variables in the tests