Remove uverlay from dgu_user dependencies
Cosmetic tweaks in tests