Fix for topcoat issue #393

Previous patch did not handle mobile switch component
This works for all versions
Also updated the tests