Cleaned up Assertion.js and made assertions.js only depend on expect.fail