Merge "updated version of switch restart test"