Remove warning related to Exceptions
Finish unit tests