Tidy up notices, tests, etc.