Made test faster
Made tests more robust.  Though still with real failures.