Tweaked exception message
Updated the exception tests