I think this could be a base class for the Rest tests (or maybe two), which would allow us to avoid the static maps.