More test scene tweaks