More test fixes related to FK change