Fix to work with both aws and aws_testing