Cleans up tests for #20235