Tweaked testing ...