Tweak LightTest to fix issues