Added new yml files for testing, added tests for keymapper and
improved/fixed bugs