Clean up chai definitions, and add support for chai-http