Added test switch