Refactoring the velocity hack : updating test.