Revert changs to Flush point tests made as part of 4ad3e9

This should resolve timing issues that are currently being seen.