Temporarily comment in unnecessary tests