Fixed the tests
Merge branch 'CB-7001' of github.com:surajpindoria/cordova-cli