Reorganized properties to be easier to read and refactored unittests to use the OGR library directly instead of hard-coded values