More methods returning java objects instead json
Added more tests