Functional Tests v1
Merge pull request #598 from merk/mapping-tests

Adds initial functional tests