Testing fixes.

-Addressed stuff for #251.