update UnitTests
exceptions fix