change tests to match behavior of current impl, which is generally better in these *particular* cases than the trunk