Fix up unit tests
Tidy up of some log calls