Updated exception lists and tests