Updated tests to resolve some issues.
Merge branch 'develop' of github.com:meltmedia/gitflow into feature#testeroos
Update tests.js

It's more better now!
Merge branch 'feature#testeroos' into develop