Fix FK test errors