Change @test_throws to only check for a single exception type

Also update test suite to follow suit