Fixed the structure of the reverse-engineered mapping
Fixed the test expectations for the DatabaseDriver
Merge pull request #1123 from stof/patch-1

Fixed the structure of the reverse-engineered mapping