Clean up the example test; Fix a minor bug