Added HandiService mock and proxy