Starting some mapping scheme tests
Adding in some mapping tests, which appear to reveal a bug.