Added test cases for #344, #348, and #357.
Merge branch 'master' of git@github.com:osate/examples.git