Fixed up some commented out tests which I missed previously.