Fix most tests, convert to request from superagent