Add in flagging tests