Bumped ion-defs
Bumped pyon
Fixed tests to match code changes
Merge pull request #1141 from shenrie/master

Fixed tests to match code changes