fix some other tests -- don't know why guard didn't find them earlier!?