Fixing two tests to work around postgis 1.5 differences.