Fix two failling tests in cmd_pi