better fixtures for testing mapping, re-enabled functional tests