Merge "Add correct flagging for tests" into main