junit improvements: assertEquals(null, ...) -> assertNull(...) attachment.getAttachFileName().toString() -> attachment.getAttachFileName().getValue()