Added some tests to simple switch