Added signature / test mode support