adding more tests, moving to should.js