Cleaning up tests and other bits and pieces.