Increase max delay for instance boot
Changing test users to match the rest of the scripts and updating some ifs
Fixing function renaming problems
Making IP address detection more robust to network naming
Picking demo image over kvm