Moved cf-upgrade to its place (alpha sorting)
Incorporating feedback from Edward and Sigurd.
Updating unit test as a result of the code changes