Fixed attachment name. Just the basenames are sent.
Fixed message tests.