- Invert expecting logic
- Missing NULL here
- Reuse more code on VM
Merge remote-tracking branch 'upstream/master'