Revert "Update to work with 1.0 and mocha test runner."

This reverts commit a1ce6e4e3808ae4c47b08f4cdbfdf4c6cf22043b.