more tweaked tests