Correcting test, generating coverage.
Removing submapping, adding more tests.