Logging and test clean-up