Added more tests and worked on adding support for "canned errors".