Adding more tests, handle exceptions