Updated tests with new flag positions.