Simplified the variable declarations in the tests