refactor(tests): remove unused variables and tweaked variable names