GATEWAY-3443: clean up misc unit tests.