Fix up tests for previous commit