added AWS and Test