Refs #412. Improved layout of tests and made switchTo more efficient.