All test passing; refactored code to include messages as vars