Added test mode