Fixup some helper fns that were marked @Test