fixing unit tests
refractoring
Merge pull request #1436 from nlake44/wheezy

Fixes for GCE API