Some exceptions checks added to Unit-test