Added more tests
Added grails wrapper