Fixed last reference, and failing test.