Merge "Fix tests" into pi-dev