Test clean-up: Remove unused variables, only import variable file where it is needed.
Test clean-up: Better name for variable file containing only arguments.