Adding extra and correcting geom methods and updating unit test.