fix: bagot and stealthy behavior, UT added
fix: conflicts