Added exception
Switched args
Renamed test methods