Hacky rename + other test tweaks, make test nodev