Added new test and removed old exception.
Added test.