Fix other sara todos on old tests.