Set default values on Mapping correctly and improve tests.
Minor improvement for CommandMapper tests.