Simplify Bluebird spec, add some tests
Make spec tests independent from implementation