Merge "remove redundant negative flavor admin tests"