Upgrade test to not make umask assumptions