fix s3-xml test

(egg on my face!)
namespace cleanup

Import everything with (), so that our objects don't end up with any
unexpected methods on them.