S3 as default destination
Added unit test and small bugfix
bugfix + unit test