Fixes for image and static ip tests
Merge pull request #42 from maksimov/2014.03

Fixes for image and static ip tests