Additional fixes for GRAILS-10708
- return 0 when tests pass