Fix tests for mvel -> groovy transition