Added more tests for exceptional situations