Slightly renamed test methods
Deleting unused exception