fix hardcoded bucket names, use env vars for test