CLI Test

CLI Test now running anywhere, if in remote mode.