Made test suite green.