Merge "Remove an obsolete test" into pi-dev