Refactor and cleanup utils
Remove mocha-as-promised
Update repo URL