Hopefully a 2.7 patch would also apply to 3.3, so yes, start there.

For the test, I was thinking that in 3.3+ we could use mock to introduce a delay.  But looking at the code again it isn't obvious that there is a meaningful way to do it that is worth the effort required.  So let's forget about the test for this one...a comment about why the time set is done before the move would be worthwhile, though.