Fixing minor issues

* fixing fail message
* git should do a checkout no matter what branch
* git should merge origin/master, not origin master
fixing tests