put geometry in right place and add test