Removed 'test mode'