Fixes the versioning issue in live tests as well as other stability issues

Specifically, neutron live tests.
Nice! Then let's keep this as-is.