Upgrade groovy tests
fix recursive exception call