Update test cases, New Exceptions and some features