Refactor mapper spec for clarity