Tests PASS (removed calls to get_var()) and minor refactoring to reduce code noise/duplication between tests.