Wip 7438

Fix 2 different tests.  One of which is for tracker 7438.