Upgraded to the new test-interface.
Merge pull request #39 from benmccann/new-testing-interface

Upgraded to the new test-interface