Out of interest, this PR seems to add many tests; Are they all directly related to the issue at hand?