Shapes test updates

@betravis - can you look these over when you get a chance? no hurry, just want to make sure the serialization changes look OK.