More true/false testing tweaks