Revise directgov tests to match new mappings