Fix test failures that were distracting me