Get Travis build working. Add expect.js to list of dependencies
Refactor tests to be a little more readable