Fix activate to not add the root env to the PATH
Split up and add more activate tests