Brought back removal of -TEST services after testing.
Added superuser check in svdadduser.
Fixed typo in root check...