Cleanup and more tabSwitch tests.