String Based Threw Fixes

Cleaned up if check per cjohansen's request.
Added test cases per mantoni's request.