Bug 903033 - Update testing interfaces

r=lightsofapollo
Merge pull request #47 from jugglinmike/testing-interface

Bug 903033 - Update testing interfaces