Refactored test to be a little more readable

Fixes #12