Fix right_aws expected options take 2