More update to unit tests
Update Exception Messages