Corrected tests to follow new conventions for expected exception