Fix some test leakage