updated to use custom expect.js and expect#within