Fix up expected return code
Fix typo
Merge pull request #66 from Metaswitch/scaling_down_fix

{Reviewer: Andy} Scaling down fix