Clean up test suite

Refactored test suite to reduce code complexity. Added "contains"
helper.
Merge pull request #16 from dockyard/bc-clean-up-test-suite

Clean up test suite