Comment out unnecessary tests + those to be replaced
Tidy up publication steps

Removed a redundant step and set a more generic instance variable for
the attachment
WIP editing attachments