fix mock to reality

hvm based images can not have a digit at end of device name. AWS throws
an error. mock needs to reflect reality.

PR is WIP:

- [ ] need to figure out how to determine if a instance is hvm?
- [ ] need to integrate test (at least manually) to verify mock behavior etc.