Updates to make code and test compatible with postgis-2.1.0beta3dev.