Timing problem in test (hopefully fixed)!