Tests are now using should.js, minor changes in models and helpers