More test fixes related to merge from master and previous serialization fix.