Tidy up testing/logging