better fixtures for testing mapping, re-enabled functional tests
Merge remote-tracking branch 'origin/develop' into develop