Add crude client test mode