Short flush tests all working