Fritz tests cleanup