Unifying remote and local calls
Tests redesigned all to gether
Merge branch 'master' of https://github.com/kvahed/codeare