Continued tweaks to improve tests