Adapted test classes for testing annotation enumeration support (corrected)