Add test for new Exception
More docblock fixes