Merge pull request #41 from mDialog/master

Multiple Proto handling tests
Test improvements to the last merged PR.