extracted AutoAddStrategy
faster tests