Use Exception
Fix Unit tests, fixing errors