Merge "Add a few tests that FRONT_BUFFER is flushing properly" into tm-dev