[INTERNAL] m.Switch: isolate unit tests from m.App

- remove m.App dependencies
- minor cleanup

Change-Id: I573e6ecc5b17044e8e2057753dfe0a472b9c6844
Merge "[INTERNAL] m.Switch: isolate unit tests from m.App"