Fixed throw tests
Made some simplifications