Fully flesh out the AWS props, add test