unit tests: miscellaneous cleanups