Merge changes I9f754223,I7d6eaa72 into main

* changes:
  SwitchInputMapperTest: migrate to InputMapperUnitTest
  Extract SwitchInputMapperTest to its own file