Tests pass

Change-Id: I1897d4db8357af386932378304a692ca1ea2b37d