Adding test mode