cleanup some test noops