Change tests to match current behaviour