Some tests still failing, but now I have more for throwing exception