Fix Test Timing Problem