Add additional information to exceptions
update test cases