Fix timing problem
More test suite hardening