Add a 'scopes' block in mapping_spec

* Move the only other scope tests to it