Fix test failures

These got messed up in all the experimentation that happened on
the factory branch.