Simplify test to make more reliable in the face of 'grails upgrade' command being unreliable.