Tweaked tests more