When running unit tests, if an IntegrityError error is raised (even if

it is caught), it will break the transaction the unit test runs in.

Therefore, we have to run the potentially exception-raising code in its

own atomic block to avoid this happening.
This also changes a mistaken reference to self.self.local_site_name.

Ran unit tests.