Updated test switcher and some snippets