Refactor tests to include ApplicationHelper