Refactor mapper spec
Use new result methods in specs
metafactor out status query methods