more tests of self-cal and cross-calibration