Allow for default poll start and stop times to be overridden
Ensured the Master server was stopped in a test that started it