Fix groovysh tests

Fixes on e set of failing tests due to broken mocking