Test change: use timeout after copying test-fs
Test change: use timeout after copying test-fs

See commentary in the patch. Prior to this change tests would
intermittently fail due to duplicated watch events on OSX.

cpettitt/watch-sync,cpettitt/watch-sync