Fix tests and remove uneeded dependencies on users and zsh