Additional changes to example and test cases.