Remove S3 requirement from Dev, Test