Merge "Remove superfluous test" into pi-dev