Removes three-argument raise style.
Fixes two tests that were broken and not providing 100% coverage.