Fixing timing of tests