Some general cleanup and changes for current tests and redundant warnings

Cleaning up some redundant warnings and getting current tests to pass except for Geospatial.hs tests.