So there are definitely issues with the exception tests as @btm has noted -- I need to clean those up.