Refactored exception name. Added new tests and functionality to support these passing tests