new test mode support