Fixed up aws_resources and added tests