Fixes for image and static ip tests