Updated unit tests to work with S3 bootstrap process