Fix s3 tests
Fix redshift tests
Made things better, but not good enough