Addressed small issue with raising of exceptions. Finished test suite.