updated tests to simpler proto format
simpler format and merge and mergeFromObject support
0.4.0