Merge pull request #80 from endesigner/OneZero

Nicer rpc tests.
Fixed the issue with Two cpp files in templates.