Test for some cases handled by Tom Prince's branch