Refactored some of the var names used in test.js.