Remove duplicate tests, enable AUG_ELABEL