Refactored test to be a little more reasonable.

Fixes #12