Test produces shapefile

My -ff seems to not be clearing up the history, apologies for that.  But this pretty much just has the test fix, you can disregard extra commits.