Quick fix to bring the test back to normal
Merge pull request #93 from eucalyptus/quick_fix

Quick fix to bring the test back to normal
Merge pull request #11 from eucalyptus/master

Merged quick fix to sauce issue from updtream.