Clean up test to use thrown? macro.