Updated tests as well as props for AWS