Uploaded original terminal and tests