Refactored test.
Fixes #16