wip
Kill the colon shorthand, { as: ‘war’ } for remapping

also fix dem tests