3933 Two test tweaks